Also, remove unused management macros and a wrong "+ 4" in announce
length.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>