Made tab wrapping work.
Merged.