Makefile-decls.am: Some minor fixes from hotssh