Merge "Resolve a couple of TODOs in firstpass.c"