Use property list for tunnel definition.

Get rid of ugly macro that should have been a function in the first place.