Minor code and test clean-up.