Shortcircuit to help dedent.
Misleading comment
Syntax simplification
Less magic in path handling.
updated changelog