Fix problems due to integer/float fallback and macro/for hygiene