Further puppetmaster-passenger changes.