So, I thought about doing this, but removing the `_source.` workaround means removing the ability to get back a `Map<String, Object>` for an object-type field from the Java API (you would then have to retrieve each leaf field individually) which I think a lot of people find useful. I can go either way on it though, I just lean towards keeping it.