And I don't have all the C++ issues. As far as I know, stor-layout.c has almost no "C++ issues": the point of separating layout into different functions was to keep that in the front end.