Add shm/reformat-decl