Improved: Used more declarative style for the context map, preferring map literals over imperative map. (OFBIZ-8853) Thanks Mathieu Lirzin for your suggestion.