In the rush to finish the driver, we're accumulating technical debt. We should clean things up early before too much more is built on top of it. This epic will track these sorts of internal clean-up tickets.