Less cruft this way