Update

Both SMRs now passing their (prety minimal but actually testinge everything) tests, at least on x86_64.

Will run a build-system wide build in the morning.