Merge "Small clean up of fuse code."