Remark static functions for performance. Same 15 test failures as before this change.