Cleanup for 1.7
Applied evildeeds fix to avoid wrong data values ( https://github.com/udoprog/c10t/issues/283#issuecomment-52826887 )