Fix regression/typo from last commit.
Fix regression from switch to bitfields