Removed use of "optional == boost::none" to compile with GCC