Method opt

Pulling over changes from my personal checkout of Pyret.