Update JLayout compatibility to match J!3.2 code