Approving this because nothing screams of being wrong and I'm not uncomfortable with anything in this MR, but my knowledge of the low level bits of SM1 is pretty weak, so I can't really give an independent confirmation that we want these changes. But I have a general trust that Zeb knows what she's doing! :-)