minor clean up and a bit of code to make writing sinks that only care about entries easier