Simplify versioned block