Minor changes to make some stuff clearer.