Added some more layout-generator annotations.