Already talked about this one with @hakubo when he made the initial PR. Good point, but would be handled as a separate task.