reverts 03569dc7 "I hate the positioning of the
expander checkitem in hierarchical view". I still hate it, so merge together
the various places where different efforts are made to try and position the
checkitem optimally and provide a single central place to do that.

Change-Id: I047504945fb5bf94e5f451007eb74328b8b56785