Syntax fixes, require all but macro_string from spf.rb.