Return failure code when lint fails.
Fix bug 436. Only restore axes that remain after an option update.