Small refactoring; patch from nus
Small refactoring; patch from nus

frantisekfarka/ghc-dsi,nushio3/ghc,vikraman/ghc,sgillespie/ghc,forked-upstream-packages-for-ghcjs/ghc,christiaanb/ghc,da-x/ghc,vikraman/ghc,elieux/ghc,AlexanderPankiv/ghc,jstolarek/ghc,urbanslug/ghc,GaloisInc/halvm-ghc,AlexanderPankiv/ghc,tjakway/ghcjvm,ekmett/ghc,TomMD/ghc,ml9951/ghc,mfine/ghc,GaloisInc/halvm-ghc,lukexi/ghc-7.8-arm64,elieux/ghc,elieux/ghc,elieux/ghc,mcschroeder/ghc,vTurbine/ghc,forked-upstream-packages-for-ghcjs/ghc,TomMD/ghc,ezyang/ghc,GaloisInc/halvm-ghc,acowley/ghc,AlexanderPankiv/ghc,spacekitteh/smcghc,tjakway/ghcjvm,christiaanb/ghc,jstolarek/ghc,ghc-android/ghc,elieux/ghc,tibbe/ghc,da-x/ghc,mfine/ghc,TomMD/ghc,tjakway/ghcjvm,nushio3/ghc,olsner/ghc,anton-dessiatov/ghc,ml9951/ghc,shlevy/ghc,ryantm/ghc,gcampax/ghc,olsner/ghc,sdiehl/ghc,mfine/ghc,anton-dessiatov/ghc,gridaphobe/ghc,ezyang/ghc,sgillespie/ghc,shlevy/ghc,GaloisInc/halvm-ghc,frantisekfarka/ghc-dsi,acowley/ghc,elieux/ghc,olsner/ghc,holzensp/ghc,christiaanb/ghc,mettekou/ghc,holzensp/ghc,ghc-android/ghc,anton-dessiatov/ghc,olsner/ghc,holzensp/ghc,fmthoma/ghc,vikraman/ghc,mcschroeder/ghc,sdiehl/ghc,green-haskell/ghc,christiaanb/ghc,shlevy/ghc,nathyong/microghc-ghc,ezyang/ghc,holzensp/ghc,ml9951/ghc,TomMD/ghc,oldmanmike/ghc,vTurbine/ghc,snoyberg/ghc,green-haskell/ghc,lukexi/ghc-7.8-arm64,wxwxwwxxx/ghc,acowley/ghc,ml9951/ghc,sgillespie/ghc,vTurbine/ghc,nushio3/ghc,wxwxwwxxx/ghc,sgillespie/ghc,ryantm/ghc,AlexanderPankiv/ghc,ekmett/ghc,mcschroeder/ghc,fmthoma/ghc,fmthoma/ghc,mfine/ghc,vikraman/ghc,green-haskell/ghc,wxwxwwxxx/ghc,mettekou/ghc,nkaretnikov/ghc,oldmanmike/ghc,hferreiro/replay,gcampax/ghc,acowley/ghc,mcschroeder/ghc,mettekou/ghc,snoyberg/ghc,mfine/ghc,vTurbine/ghc,acowley/ghc,mcschroeder/ghc,acowley/ghc,AlexanderPankiv/ghc,snoyberg/ghc,ryantm/ghc,ezyang/ghc,bitemyapp/ghc,nathyong/microghc-ghc,wxwxwwxxx/ghc,vTurbine/ghc,mfine/ghc,nushio3/ghc,hferreiro/replay,mettekou/ghc,bitemyapp/ghc,AlexanderPankiv/ghc,anton-dessiatov/ghc,tibbe/ghc,oldmanmike/ghc,TomMD/ghc,gridaphobe/ghc,mettekou/ghc,sdiehl/ghc,siddhanathan/ghc,urbanslug/ghc,nkaretnikov/ghc,ryantm/ghc,lukexi/ghc,nkaretnikov/ghc,ekmett/ghc,hferreiro/replay,snoyberg/ghc,GaloisInc/halvm-ghc,snoyberg/ghc,fmthoma/ghc,vikraman/ghc,christiaanb/ghc,ml9951/ghc,olsner/ghc,urbanslug/ghc,tibbe/ghc,elieux/ghc,shlevy/ghc,tibbe/ghc,vTurbine/ghc,siddhanathan/ghc,gridaphobe/ghc,vTurbine/ghc,lukexi/ghc,mettekou/ghc,sdiehl/ghc,wxwxwwxxx/ghc,forked-upstream-packages-for-ghcjs/ghc,gcampax/ghc,vikraman/ghc,da-x/ghc,ezyang/ghc,jstolarek/ghc,oldmanmike/ghc,frantisekfarka/ghc-dsi,nkaretnikov/ghc,spacekitteh/smcghc,fmthoma/ghc,bitemyapp/ghc,ml9951/ghc,nathyong/microghc-ghc,ghc-android/ghc,hferreiro/replay,hferreiro/replay,ghc-android/ghc,tjakway/ghcjvm,anton-dessiatov/ghc,gcampax/ghc,TomMD/ghc,olsner/ghc,fmthoma/ghc,wxwxwwxxx/ghc,gcampax/ghc,lukexi/ghc,spacekitteh/smcghc,anton-dessiatov/ghc,jstolarek/ghc,nathyong/microghc-ghc,oldmanmike/ghc,gridaphobe/ghc,sgillespie/ghc,urbanslug/ghc,fmthoma/ghc,shlevy/ghc,ezyang/ghc,bitemyapp/ghc,holzensp/ghc,frantisekfarka/ghc-dsi,siddhanathan/ghc,christiaanb/ghc,anton-dessiatov/ghc,oldmanmike/ghc,gridaphobe/ghc,wxwxwwxxx/ghc,da-x/ghc,tjakway/ghcjvm,ml9951/ghc,nushio3/ghc,lukexi/ghc-7.8-arm64,vikraman/ghc,nathyong/microghc-ghc,spacekitteh/smcghc,mettekou/ghc,nkaretnikov/ghc,nathyong/microghc-ghc,shlevy/ghc,ghc-android/ghc,siddhanathan/ghc,spacekitteh/smcghc,urbanslug/ghc,ekmett/ghc,frantisekfarka/ghc-dsi,ghc-android/ghc,gridaphobe/ghc,lukexi/ghc,TomMD/ghc,urbanslug/ghc,nkaretnikov/ghc,shlevy/ghc,hferreiro/replay,oldmanmike/ghc,snoyberg/ghc,christiaanb/ghc,mcschroeder/ghc,mfine/ghc,tjakway/ghcjvm,AlexanderPankiv/ghc,forked-upstream-packages-for-ghcjs/ghc,urbanslug/ghc,acowley/ghc,da-x/ghc,GaloisInc/halvm-ghc,lukexi/ghc-7.8-arm64,ghc-android/ghc,nkaretnikov/ghc,gridaphobe/ghc,da-x/ghc,ekmett/ghc,forked-upstream-packages-for-ghcjs/ghc,sdiehl/ghc,tibbe/ghc,forked-upstream-packages-for-ghcjs/ghc,mcschroeder/ghc,sgillespie/ghc,lukexi/ghc-7.8-arm64,green-haskell/ghc,nushio3/ghc,gcampax/ghc,olsner/ghc,nushio3/ghc,lukexi/ghc,siddhanathan/ghc,gcampax/ghc,GaloisInc/halvm-ghc,siddhanathan/ghc,ezyang/ghc,tjakway/ghcjvm,hferreiro/replay,sdiehl/ghc,sgillespie/ghc,snoyberg/ghc,siddhanathan/ghc,bitemyapp/ghc,nathyong/microghc-ghc,green-haskell/ghc,jstolarek/ghc,ml9951/ghc,forked-upstream-packages-for-ghcjs/ghc,ryantm/ghc,sdiehl/ghc,da-x/ghc