Minor trace line bugfixes.