Don't handle NONE specially