Some AutoExposure refactoring and clean-up