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

Also see http://stackoverflow.com/questions/20847928/slick-2-0-and-intellij-highlighting-errors
review by @szeiger