Removed name & type parameters from resolve expressions, not sure why they're needed