Refactor bit/if-feature statements