Bitmark syntax cleanup