Changed file API slightly and fixed method call on expressions with parenthesis.