Oops, still had an unaligned stack in some thunks.