Further refactoring of device advertisements.