Tweak syntax for PR from #394 to improve performance; Update CHANGELOG