Replace single variables by base entries for them, if possible. Also,
lots of small changes.