Refactoring.
Convert away from @1.