Clearly staging branch testers weren't testing. Also, clearly the separation of RST_ bits and RCC_ bits is a complicated annoyance. Fixes: d9615a2eb728 update to modern include apis