Minor optimiziations.