I feel like the current flag solution is already a good compromise, and don't believe a split is necessary.