Some cleanups based on patch by Nguyen Anh Quynh