Clean up course unpackaging logic slightly