various cleanups to get ec2 subnet api up to latest

mostly tidies

cc @abayer