Is all this code churn necessary?