This is the first step toward removing the compile-time difference in style between Layout 2020 and Layout 2013.