Merged bugfixes from pyethereum/compiler