Remove redundant declarations. Join declaration and assignment

Swap some paramter types

Fixed bug in ExpandTemplate using m.Success not m1.Success

Remove unused code lines

git-svn-id: svn://svn.code.sf.net/p/autowikibrowser/code/AWB@9398 5227b50d-9349-4574-b055-4b0a7525e11c