Original now compiles, yay.