Support for Option Types on Nullable Columns.

Also cleaned up / removed some old condition active patterns from CRM