Use consistent interface for basic blocks