Making output match annotation style

Adding brackets for literals to match the annotation style. Spacing does
not match, but does not seem worth changing.
More hacks for the aligner