General cleanup of refactoring remnants.