Bug 20137 - Fix alignment usage when demarshaling basics