did a bunch of housekeeping to track down a stale reference regression :(