Misc. cleanup in response to feedback.