Fix #816; remove references to valueWindow (#817)