Simplify object declaration

Merged Bastien Nocera requested to merge wip/hadess/simplify-decls into master

Merge request reports