More refactoring around `me.device`