Add more tests.
Eliminate the unused NullModifier.
Restructure code to avoid cycles and prepare to break Behavior out into separate classes.
Break the behavior class apart into its own package of classes and interfaces, refactor it heavily, and add tests.