Removing changes that would break external codebases, but highlighting them. Adapting abenc_waters09 to be PEP8 and PEP257 compliant.