Fixes for unnecessary emits on nested datastructures