Fix mc/parser.rs and tests in mc/resolver.rs so they compile again.