Fix wrong abstractions

In the long run, it's better to fix wrong abstractions ASAP than to add more code and make everything more complicated.

Your goal is to remove the abstraction and conditionals, and to reduce each caller to only the code it needs. Here's how:

1. Re-introduce duplication by inlining the abstracted code back into every caller
2. Within each caller, use the parameters being passed to determine the subset of the inlined code that this caller executes
3. Delete the parts that aren't needed for this particular caller

Once done, you can start anew, re-isolating duplication and re-extracting abstractions.