shorty: Some minor logical enhancements...