Remove redundant check; tweak 'naked' lookup