Expand the list of identifiers for which we substitute `_core.<Something>` for `<Something>`. Also an alternative fix for #421.
Expand the list of identifiers for which we substitute `_core.<Something>` for `<Something>`. Also an alternative fix for #421.