Tidy up, fix and simplify a few of the SMLocs. Prior to r179109 the Start SMLoc