Cleanup delete/merge/write cohesion

The three methods are not public, and are not used in fluent way. Group
them together and make sure they look the same.

Change-Id: Ib0acb09020b381e8fc259e862ed6b340bd7260e2
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Cleanup delete/merge/write cohesion"