More changes to InL2 as suggested by Olly and Dan.