GRADLE-3185 - Improve class decoration so that it can deal with property access in the constructor. Fleshed out int test coverage a little more.