Minor camera impl refactorings