Tweaked the workaround for #2061 and #2428 to try to get rid of implicit properties (only define columns).