don' use the same feature for different things

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@8456 5f5364db-9458-4db8-a492-e30667be6df6
cleanup

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@8457 5f5364db-9458-4db8-a492-e30667be6df6