Improved routes to stop variable names being exposed.