Replace references to .system

@nedbat @sarina: Review?