The reverted patch to change functions from strict to immutable was incorrect and needs additional research.