Restore missing check to let double-handed weapons work
Add OPTION_IS_SOME branching macro
Convert container lookups to use Option<Borrowed<T>>