CXX-20 fixups from last round of reviews