Avoid now-illegal passes by reference
Merge branch 'wheezy-changes'