Small less cleanup and fixed #685.