Final polish concerning #543