In other places, we've been listing these fields explicitly only for calculated fields.  Do we need each of these here, or is hte field tuple on lines 246-253 sufficient?