Some RDArr source cleanup.