Add MlabNS support

Actually use MlabNS when the user wants it. Also,
reformat the code so that spaces-before-newlines
are not so much of a problem.