Camera coding cleanup.