fix 64-bit issues, revert CTFE workarounds