An extra bit of polish after bmorel's patch.