Minor tweaks to the new APC/power control system.