Split rebuild entries into two methods, callable separately.