I'd love to see lazy imports become part of the upstream at some point.