Removed unnecessary proc arguments, and an unnecessary proc itself.