Add deprecation facility, and deprecate some old options