Fix busted defaults for fields. Fixes EMP-243
Adjust import to get implicit field constructor in place. Refs EMP-245