Refactor: fixup.