Use the PEP 661 sentinel type where appropriate (#1190)