Better -h support. Reduce misc whitespaces between |s and []s