Misc Cleanups

Note: this patch-set includes the patch from haskell/primitive#1