Explicit subsection for comparison with C. More tweaks.