Merge "Actually use listener hints?"