Tightening up Option api; making None singleton, and relying primarily on static factory methods none() and some(?)