Stub refactor complete.