Better support for param completion