Amendment to issue #482 and issue #481.

Was already merged in Bitbucket before import, marked as merged by the import user

Code cleaning: removed lines I had commented out while working on #482 (closed). Fixed a wrong word choice in a comment (#481 (closed)).