Some cleanup, and a bug fix for tabsize.