Clean up .ghci
Merge branch 'maint-2.4.2'