Removing calls to deprecated writer instantiations.

Additionally, adopting compose() test case to changed semantics.
Supporting composition with empty set.
Removing redundant code that is present reference MapWriter.
Merge with master branch.