Minor cleanup of literal extractor