Convert last(?) enum's to bitshifts
(cherry picked from commit 13965d37cada221e46ec83b29de6a0909eab1ba9)