Fixup's from jamal for last round of classifier/action changes.

BKrev: 412a51995cOYkmyyknExfODJ1Zi4Wg