Add tests for that "hack" code (the alternate forms that sometimes occur).