Make default variables strongly-typed