clean up: branch bs.obj logic handling as early as we can

Author: bobzhang