NXP-14879: clean code
NXP-14879: Impl selection on histogram and date histogram aggregates