Further improves paren-calling