WyIL: Continued fixing up code.

Refactoring code after significant changes to the CodeBlock API.  There
is a lot of work to be done here, and frankly it's hard to do the
changes in a sensible fashion sometimes.