Backward compatibility.

Some, to make some existing things happy. We don't want to push this too far though.