Removing superflous template disambiguation

Also added some GCC 4.7.3 workaround, hurray for supporting more than one compiler!