good catch.  fixed.  (I'm also not liking having several conditionals
on 'raw'...)