Trimmed down macros from spire