Fix #95 cleaner implementation of parse/redaction.