I disagree with this refactor, because I think we should request the wake lock as early as possible in the message handler, and an additional variable and one less indentation level are not compelling reasons to postpone that.