Re-added "__NOTOC__" that shouldn't have been removed, improved comments

Change-Id: I920e14f3107670a8f731c78ced46a5e4e9a23a15