Minor cleanup of Watch.hs