Merge "Further firstpass.c changes." into experimental