Restructure parse functions.