Changes to get to work with latest ASDF.  Also deal with "lambda in
defconstant" issues.