Applied (mostly) as r3203 and r3201