Better pinpoint toss / architect's wrath interaction.