Restructured all single-use element declarations to be inline, for
simplicity.