More stringent deps
This does not contribute business value, but it was an interesting exercise in middleware.