Refactor multivalue return to avoid clang quirk.