minor reorg on PowerDecoder2, use switch/case rather than if/or