w-t: fix up some merge damage

Signed-off-by: Bob Copeland <me@bobcopeland.com>
3 files changed