Clean up and remove (if-let ...) forms for clarity.