Missed restructuring changes in previous commit.