Whitespace in generated code, fix supertypes test

* Fix supertypes test - it's not broken here, but doesn't work with starseeker's branch because of a CMake macro change
* Two trivial changes to generated code:
  * don't duplicate global rules as comments (this change was made for functions, etc months ago)
  * don't show empty lines in express rules/functions/etc