the `that` is stylistically inconsistent (which makes step reuse harder)