Split resolved and non-resolved parsing