Change how we comment out optional features. Fixes #84