shortString parameter is always called with false, remove it and simplify code
Merge pull request #490 from Trott/simplify

shortString parameter is always called with false, remove it