Further cleanup.
Cleaned up Automake side effects.