Even more rubyfication