A few more changes to cut down character count.