lib -> option-types; cleanup