More work towards translating L2 -> L1, with some minor changes to L1 to ensure we capture the right information to translate into L2.