Now converting to option types on output where needed. Rolled back decomposition of option types.

Signed-off-by: Rick Minerich <richard.minerich@gmail.com>