Refactor pass-delegated.rb (refs #342).