Two new tests.
Merge branch 'jroesch-generalized-where-clause-parser' of https://github.com/nikomatsakis/rust into generalized-where-clause-parser
Address PR comments