Yield and trim strings, fixes alias burnouts. (at least some)
Merge remote-tracking branch 'origin/jacob' into jacob