Merge pull request #636 from slick/tmp/fix-634-binary-compat

Fix codegen hlist workaround binary compatibility