Incorporate additional abstractions from 1605431.