Fixed bug #165: Use multi-and and multi-or always. WS cleanups.