Further clean-up: usage() vs die()