JBEHAVE-1053:  Simplification.