Fix codegen hlist workaround binary compatibility

Supposed to be merged shortly before 2.0.1 is tagged, when 2.0 has been finally merged back into master

review by @szeiger