Until your softare gets so bloody huge, you can't refactor quickly.
Chances are, if you add expansionability (is that a real word), then you'll have something in place that itself can be refactored with much ease. You won't have to hack in expansionability. (two times!)