Additional factoring to allow more NE recognizers; bug fixes