g10: Minor clean up.