Discovered the relevant matrices can be row phased; simplified circuits some more