Properly got rid of extra types in Take/Take1/Emit/Emits/Return. Quite
a bit of code deleted.