MIFOSX-97: tidy up of maker checker based on audit work so far.