#103: refactor to a single enable type
#103: correction to fit WouterJ review