A few more layer stack formatting tweaks.