mfsmaster: Optimise & cleanup if()