Minor code reorg and refactorings.

 * ensured that unicode is used throughout analysis (and tests)

Author: pombredanne