Small cleanup to use pk all over the place.