(Thanks to Patrick Strawderman for pointing these out and providing
initial fixes.)