Shore up rules to match the sources of a few more SVN cps