Make code compilable under 1.6 still (until we decide otherwise)