Refactoring shenanigans.