Another refactor
Waiting in pascal.c