Split composite feature extraction into two decorators.