Much breakage of comments from @Xyene's refactor.

@FatalEagle Happy now?