Further cleanup and simplification.
Preparing for awareness threading.