Sharkskin disarm tweaks.