am 50ed320c: Fix getShortString(), tune evaluation heuristics.

* commit '50ed320c1cdd1b3624f73956a80eb2f2c2f5a01d':
  Fix getShortString(), tune evaluation heuristics.