Fix bug in bbq-src. Improve bbq-click support for arguments.