Moves some patterns out into CF and brings them back in.