Whitespace around - and + can't always just be stripped
Shorten zero-values