Finalize the cleanup which began in 05b5aab21e54d8e766cc56d33a6a3d855b686dc4 (this just adds additional comments to future-proof this stuff).
Finalize the cleanup which began in 05b5aab21e54d8e766cc56d33a6a3d855b686dc4 (this just adds additional comments to future-proof this stuff).

balderdashy/waterline,luislobo/waterline