Boolean simplifications

Tweak declaration syntax

git-svn-id: svn://svn.code.sf.net/p/autowikibrowser/code@9415 5227b50d-9349-4574-b055-4b0a7525e11c