Avoid unit insertion
Avoid ugly `e -> (())`
Deal with deprecation warnings from Scala 2.11

This is only for the warnings which might be fixable without breaking
support for Scala 2.9.
Address Scalaz-related deprecation warnings
Merge pull request #760 from Blaisorblade/topic/deprecation

Reduce deprecation warnings