Fix up references. Test yasnippet expansion.