I updated the middleware to always use region objects which is a little nicer. Are you wanting some cleanup of the `REGION_LOOKUP` stuff as well?