This change primarily replaces Optional[] and Union[] with the new

union syntax where appropriate. There's a few additional cleanups

sprinkled in as well.

Ran unit tests.