minor: syntactical sugar
minor: some more sugar

Works even on the old 1.9.3 method, because we chain enums