Cleanup a couple more uses of