Merge "Simplify the quasi-atomic stuff and add MIPS support."