Looks fine, but how about doing this early in the series? There's quite a bit of churn around this code.