cosmetics: Move static and inline attributes to more standard places.