Fixes #1489.
This is a WIP to clean up some manual references that are now part of SpecRef.
@MasterKale @emlun if you find others, feel free to just add to this branch/PR.
Preview | Diff