Suggestion from Jon: now the callback is passed the table-entry directly. This allows us to skip one lookup.