Update comments.
Clean up ifdefs.