Merge (and cleanup) anthm's CDR changes