Some cleanup after the libdynd PR