Makeing template use closer to standard. Now gcc 4.4 works