Allow parentheses around sources
Small tweaks and fixes.