Continued parser: And and Or nodes
Type.merge now always takes two non-nil types
Continued parser