Support for --variable (no tabs)

This is the same as #1 but without the tabs.