Assorted refactorings on CamActivity.