Port a second post + minor tweaks.