Last place we need to do this check / update.  There's probably a DRYer way to do this; would address this after `khanloadv2` is merged (easier)