Added missed flags and did a small code abbreviation. It is worrying that the testsuite did not pick this up.