shm: minor modernizations