I'll refactor these things once I hear back from @hunse!