Fix docblocks and minor refactoring of __get() method

I suspect some of them to be 2.x merge-relicts.
There are 4-5 other occurances, as well.