Tiny code clean-ups.