Hacky patch through or in-place incremental refactoring? (Honest question, my knowledge of the subway in general and this plan in particular are limited to the

Hacky patch through or in-place incremental refactoring? (Honest question, my knowledge of the subway in general and this plan in particular are limited to the comments here)