Tidied up the dual-camera setup nonsense.