Refs #463. Tweaks based on review. Thanks Kyle!