GH-8: Minor clean-up.