Bug 856313 - Clean up some Traverse/Unlink declarations. r=smaug