Specifically the cleanup is these flags should reflect the functionality they provide, not the block that needs it.