Fix QueryImpl constructor signature that caused linking to fail.
Update waf.
Drop GSettings workarounds and update wscripts.
Whitespace.