I pushed a commit for removing the `_source` workaround also, but I'm interested in feedback on whether we want to keep the original Map-like behavior or not.