Some workaround fix-esque work to prevent serious slowdown issues when refactoring.