WIP: Tidying up performance features.