Static-ify things

Change-Id: I18a7a374eaccf271aa431fe3789c8f53f57f33ff