Improve dollar signs handling.

Fixes issue #62 further.