Make clearing flags more explicit