Change states to use short-dec style

These changes should be cosmetic only. Please double-check as they were largely automated.