Updates for @jamesls' feedback.