Changed order of grammar rules for subprogram call - fixes #356