Now elegant and efficient. #1522