Performance upgrade for 1b9ff78a

Sometimes I forget this project isn't in hackathon mode :)