2007-05-02  Felipe Castro <fefcas@uol.com.br>

There are some code clean-ups here. We hope not to have created any bugs...

