Add AverageFloatSimpleMapper and fix AverageFloatC