Fix consolidation to ensure that extra_styles are always at the end.