Adding proposals by Mathieu Napoli and Marco Pivetta.