Improve train line number comparison

Also, add better diagnostic infrastructure for the comparison functions,
to replace the current local ad hoc debug output, same as already done
for the validator.