Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Justin Fagnani <519bea7d2dc73ceaf7e2d3ff2da9504641bc4e29@google.com>
lit/lit-element,Polymer/lit-element,lit/lit-element,Polymer/lit-element,Polymer/lit-element,lit/lit-element