Switch away from getitem subscript in a few places