Clean up metadata.rb per Rob's feedback.