Fix up syntax further for stricter use of BASH