Clean up Action handling classes

Along with various other associated things that required cleaning
or fixing during the overhaul

Change-Id: I36ffca215ac2a3bac056d3bdc666d6fa12053611