and more cleaning-up in libm =)