Include line number with syntax errors

Contains changes suggested in #184