Merge pull request #52 from lunaskyrise/pixie-dust-tree

Merge parts of Stage 4 implementation
Along with 6cd753e1c2ad16b74451c8404ef3e77baf3fb05f, fixes conformance
checking when redefining a method.