cleaning up some corner cases on syntax