Addresses my concerns in #326

See also #486