Closes #291 (closed).
Includes proposed TODO tags from #297.
Also removes needless "-----BEGIN" exception.