Remove superfluous checking and error messages
Shorten verbose names of variables
Fix segfault occuring when parsing old bootstrap options