separate make targets for recdescent and marpa testing; patching an annotation