Restore polarity parsing, closes #3