Make the types we use when creating GHCi bytecode better match reality