Minor restructuring following the previous commit.