some cleanup of the old magick stuff to make diffing with the new stuff easier

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