JAL-2136 JAL-2137 Improvements: enable STRUCTMODEL annotation statement to be less...