Switching some custom logic to using table-generated helper methods.  This also removes an unnecessary diagnostic.