Remove dependency on scala parser combinators, which are deprecated in 2.11