prepare handling of conditionals, refs #24