Minor efficiency updates.