Refactored inclusion

The syntax is now consistent, regardless of using [] or {} for the
include param.