Various updates towards supporting 'if' in Guppy.

This is incomplete at the moment.