Strip out helpers; start to write fields support in.