This is cool. In a future patch we should probably do this everywhere.