minor cleanings to silence stricter compilers