Fixes re: @jonathandavis

A better approach.