Implement @ztellman's performance suggestions
0.8.1 -> 0.8.2