[watersb]

Anything to help legacy C code base is welcome. Hard part is knowing whether touching decades-old, tested code is worth the risk.