oops, use non-capturing groups instead of independent non-capturing
fixed #5 -  parameters had FQNs when the javadocs were not resolved