Rather than open-coding everything, let's be routine. More verbose but less hidden surprises lurking.