options: remove old compatibility definitions

This makes things more readable.