More improvements for FAQ #2.