Simplify the variable name handling around _
Simplify the variable name handling around _

ndmitchell/hoogle,ndmitchell/hoogle,wolftune/hoogle,wolftune/hoogle,wolftune/hoogle,ndmitchell/hoogle,wolftune/hoogle