Code tidy up.  Tidy up LANGUAGE pragmas and some HLint recomendations.