fix compile error (refactor cruft) in optional class (broken in 1eb1484)