CDR: Improve handling of parking; resolve assertion when originating into park