better support for #references