Porting underscore (minor cleanup)