The code looks nice and clean, overall!  Yay merging!