Update PowerMeasure.py post-cargoify

This also attempts a bit of cleanup. More cleanup is needed.

This is probably not ready to merge as I'm getting weird results from it still.

r? @lalehb