Did some more moving of middleware to the core middleware module.