Ensure hints correctly expanded