Tidy up config constants

They're scattered around a bit at the moment.