A few vega10 powerplay cleanups

[tom.stdenis@xxxxxxx (Tom St Denis)]

Started looking at tidying up the powerplay code a bit.  I stopped
to send these out because I want to get feedback on the new CGS
macros before I go too far down this path.

Thanks,
Tom