Can we just do the extension in both cases (perhaps making it a no-op appropriately) and thus collapse this `if`?