Additional performance TODOs.