Tidy up multi-line variable support

Signed-off-by: Alex Coles <alex@alexbcoles.com>