- Two more corner cases in the oredictionary. Should work for all cases now.