Updated code to use rule builder
Replaced find with generated Matchers class

  See https://bugs.eclipse.org/bugs/show_bug.cgi?id=418498 for details