Making more amends of things gone wrong after refactor.