Is there a specific reason? That and the flags to me seem like a good simplification.