More mods for eventual Layer/Tweak support.