Moving to using the System.Monad
Made sure we got rid of the use of null internally and used the lovely System.Monad.