cleaned up regexp
forward compatibility
added indexer trait
added branch_unset method
actually, I didn't make any changes, here...