Without the flag would make the code simpler and the changes less drastic. (if they are considered drastic.)