I invented a reason to use a lambda here.
I was thinking along the lines of preventing cyclical depends, but that really doesn't matter since they're all in the same package.

This was is much easier to understand.