Makes the existing annotations match the more common one per line style
and adds a few missing annotations.
Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: NMiklos Szeredi <mszeredi@suse.cz>