TODO: we added CoreAddress annotations in Isaac's PR so whatever gets merged first we probably want to fix the other one.