Simplified things and small improvements in alignment fixes for clang.