Remove more Chris specific behavior.  This parsing behavior now lives in a separate application.