Some cleanup in Shell7Base.