Refactor around the macro definitions into 3 files. Both converter and s...

...etter support Options
why are you using valueOf here and not elsewhere? Why not valueOf everywhere?

Also, what about using `_root_.java.lang.Integer.valueOf` rather than just `Integer`?