Major rewrite for dbo_field handling, second pass