Attempt to fix test failures by coding tabs more defensively.