More declaration convention updates; preliminary metric unit support