Commit before handling static field refs