Finish initial refactor of slow retrieval attack.