Minor updates to directive and service templates.