Branch/performance

@BrettASwift @kadst43 would you mind reviewing?
See above comment - but in addition, if you're going to do it for X, be consistent and do it for Y.