Refactor scanner defs for readability.
Drop some of the exotic syntax.

Got props defined for most of the syntax defined now.