Minor follow-up / fixes to last few comits

git-svn-id: https://zxing.googlecode.com/svn/trunk@2827 59b500cc-1b3d-0410-9834-0bbf25fbcc57