Adding support again for variable alignment.