Replace some weird class syntax.

Several places in this file we do things like

class {'classname': }

Which seems weird... I'd expect that to look like:

include classname

Changing to the latter seems to resolve a weird parsing issue I'm
seeing just now... but I'm not feeling pedantic enough to change
every possible use of that syntax.

Change-Id: Iec3f4d31ac2f102a7c612143cc65881a6688c795