Like @jordwalke said, I'm going to figure this out in a separate diff. But good call.