Improve feature support functions

Make them less obscure, but still DRY.