More Ruby syntax cleanup work