See summary. Also, some copyright headers should be cleaned up to correct some accidental mangling that occurred there.
Created attachment 28866 [details] Proposed fix.
Comment on attachment 28866 [details] Proposed fix. Awesome. Though I insist that documentLIED is a valid word in a licensing agreement.
Committed as r41920.