Integrate from previous changes: cleanup powering of stuff and add lots of asserts