[MONDRIAN-1766]  Code cleanup.  Inlined conditional.