Minor rewrite to avoid ``s crud