Various improvements, including SystemD-safe fix to Clasp