Handling of more obscure arrow edge-cases