Re-organize/re-space these declarations to make it clearer that these correspond one-to-one with the older delcarations.