Can you add a `TODO` or something saying that we should bitfield-ize these two flags?