Removed yet more 5.4isms