Minor changes, mostly syntactic.