Refactor spec handling of decrypt support