Ditch 'historical compatibility' and use 'logic' instead