Fixing up tab vs. space oddness