Reverted #1628 and changed the grammar+parser of the language to not allow certain expr where types are expected