Warp unwarped procedures called from warped procedures
Merge pull request #227 from nathan/fix-warp

Warp unwarped procedures called from warped procedures