Use trimmed instead of simplified

We have no particular need to mess with internal whitespace to deal with
this issue.