Simplify ensure_canon_entry_valid by splitting out the _get codepath.