Fix from Mark Jones with additional cleanup for
  saw's misunderstanding of space point criterion