Move underscore reminder closer to relevant code