Trim values again

Trimming was accidentally removed in commit
2811ed89ead63073c0ab0b23b7adf686ffe608bc.