yet more FP beautification