Also, thank you so much for the very thorough review! This is 
pretty much my first big open-source contribution, so it's very 
helpful to get all the feedback :).