Move disarming last to remove blackboxing, fix drinking with hands

Fixes #593