Rescoping of a few func/struct.