The original return-from isn't working for me from within SBCL, either. Update that
Clean up comments
Comment about disliking constants