Accommodating recent SwingCommon changes