Implemented a significantly more robust delineation mechanism. This also allows for dollar-sign escaping, resolving #5.