Some (hopefully) simplifications in Internal