src/Streamulator: some cleanup