Fix warnings re: redefining ALIGNED