Improve standards compliance; verbosify die()