Some cleanup of uname extensions.