[builder] mild cleanup