power: Simplify the structure (and fix issues).