Tidy up configuration classes, removing qqs.