**Update**: returning a Fields object like you suggested is much nicer. Making the change now...