More cleanup and fixes of roundtrip-test.js

* Reduces incorrect semantic error reports.
* Tested on:
  en:List of Disney Films
  en:Greek Basketball Cup
  en:Aberdeen F C seasons
  en:Kenny G discography

Change-Id: I40fdfc6b40e4254c4e8a23f4b2bde0f9729a0fcb
Merge "More cleanup and fixes of roundtrip-test.js"