I suspect we have a disagreement on better code here ;-). For review purposes, I find code clarity is more beneficial than simplicity. E.g., this code is actually harder to review because it is so many repeated blocks of quite similar (but possibly different) implementations, and I need to check each place to ensure you added the proper flags.