Enums: Fix issue including boost/mpl/aux_/test.hpp before boost/optional/optional.h and other minor adaptations