Move NONE handling to switch with the rest