instrument "sol" token with indent
remove mysterious dead(?) code
rectify post-comma indentation
fix post-comma indent + multi-line atom combo