Manual: minor cleanup.