Second round of feedback from @asutherland.