Change generated code to not require macros (for IntelliJ compat)
Merge pull request #595 from slick/tmp/remove-macro-dependency

Change generated code to not require macros (for IntelliJ compat)