[#841] Fixed even more -O3 things
[#1758] Cleaned up more build stuff, also builds more cleanly on arch