This commit completes the merge of compiler part of the HEAD with the before-ghci-branch to before-ghci-branch-merged.