Simplify flag resolving