[Patch, Fortran] OOP cleanup

[Janus Weil]

> In the meantime, I will already commit the attached version (probably
> tonight), unless anyone objects.

Committed as r159506.

Cheers,
Janus