TODO squash up. fix(): trim expression before parsing it, see 7641