Remove lMapFuncAux structure as it doesn't make sense to have it anymore.

	* Also make code C90 compliant
Move to a more abstract iterator interface, haven't ported the tests yet.