A bit more refactoring of crud.feature