Model parsing cleanup.