Miss one case in previous commit and one more optimization
Miss one case in previous commit and one more optimization

LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3,LogtalkDotOrg/logtalk3