Further changes to options to match GitHub formatting.