Eliminate code dup. Use decidedFor in equality enabler methods. Also got rid of OPT in the Option enabler method.