MORTEVIELLE: Fix bug in previous commit, some multiple if statement optimizations