(Minor cleanup...)