Apply suggestions from Aaron B.