Fix two more TODOs in the FIRM constructor