bug 1010: Minor clean-ups