Some more automake cleanup