Finish getting rid of statichere/staticforward
8 files changed