safe-ish lint fixups

Change-Id: I132ad766ffac3e5e23537c824c7454dd33f6b8be
satisfy jslint complaints about "define" and "require"

Change-Id: Id018603cb367cbbb87488cc43bbeb61b0ba87020