more simplification of bsvgen