Clean up Tadpoles code further.