refactor bookmark moves

Change-Id: I13924d40ca1c31f56440b98d9a1829963cdd3e1a
code conventions, while we are at it

Change-Id: I118aa2cb8747775d8c778cf49248c7f3ef68d6a2
add second Restore function for CntntIdxStore

Change-Id: I2d4c92d0927bce13b03a6f235e14812ed1d0bd54
remove now redundant old implementation

Change-Id: Ieab4fc54be0b2e5ad547f81a7a70d84284161c47
simplify cascading conditionals

Change-Id: I957d7c368f6b7158c74268f7274d59e8a25b83e8
simplify MarkPos conditional

Change-Id: If109980429f2f87e06065837eaec7129b2ece336
BOOST_FOREACH and constness

Change-Id: I832bc8fcdfb4997c2eaae3f0cb5d7014df20f2fd
BOOST_FOREACH and constness

Change-Id: I86c86cfa245c78ce8e21d85831de5ae82f67f81e