cleanup 3pwateroil

The 3pwateroil model still uses some old idioms. For example

• #337 (closed)
• not using range based for in some places (might have been all fixed short before the 2.10 release)
• ... possibly more things