Refactor ClassAdapter for clarity; no change in functionality
Tweak build.gradles yet again, this time for AS 0.8