Make only and without behave identically

Each should overwrite the other's behaviour