Enhanced sprocs some more.