Fully convert to java7 diamond interfaces.