Some more performance improvments.