more rebase de-clobbering for libserialize