-Addressed stuff for #251.