diff --git a/src/console/init.c b/src/console/init.c
index 4859980647..d4818580e4 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -22,11 +22,7 @@
 #include <version.h>
 
 /* Mutable console log level only allowed when RAM comes online. */
-#if defined(__PRE_RAM__)
-#define CONSOLE_LEVEL_CONST 1
-#else
-#define CONSOLE_LEVEL_CONST 0
-#endif
+#define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION
 
 static int console_inited CAR_GLOBAL;
 static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h
index 6e5985448a..e9a7776d46 100644
--- a/src/include/device/pci_ehci.h
+++ b/src/include/device/pci_ehci.h
@@ -31,7 +31,6 @@ pci_devfn_t pci_ehci_dbg_dev(unsigned int hcd_idx);
 u8 *pci_ehci_base_regs(pci_devfn_t dev);
 void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port);
 
-#ifndef __PRE_RAM__
 #if !CONFIG(USBDEBUG)
 #define pci_ehci_read_resources pci_dev_read_resources
 #else
@@ -46,6 +45,5 @@ void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port);
 struct device;
 void pci_ehci_read_resources(struct device *dev);
 #endif
-#endif
 
 #endif /* _PCI_EHCI_H_ */
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index 505ccc1889..0100e270c6 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -73,7 +73,7 @@
 	ALIAS_REGION(cbfs_cache, preram_cbfs_cache) \
 	ALIAS_REGION(cbfs_cache, postram_cbfs_cache)
 
-#if defined(__PRE_RAM__)
+#if ENV_ROMSTAGE_OR_BEFORE
 	#define PRERAM_CBFS_CACHE(addr, size) \
 		REGION(preram_cbfs_cache, addr, size, 4) \
 		ALIAS_REGION(preram_cbfs_cache, cbfs_cache)
diff --git a/src/include/thread.h b/src/include/thread.h
index e6af2efd55..b66803e3c0 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -20,7 +20,7 @@
 #include <bootstate.h>
 #include <arch/cpu.h>
 
-#if CONFIG(COOP_MULTITASKING) && !defined(__SMM__) && !defined(__PRE_RAM__)
+#if ENV_RAMSTAGE && CONFIG(COOP_MULTITASKING)
 
 struct thread {
 	int id;
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 18c3b71b4f..7876ff510a 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -51,16 +51,11 @@ _Static_assert(CONFIG_CONSOLE_CBMEM_BUFFER_SIZE <= MAX_SIZE,
 
 static struct cbmem_console *cbmem_console_p CAR_GLOBAL;
 
-#ifdef __PRE_RAM__
 /*
  * While running from ROM, before DRAM is initialized, some area in cache as
  * RAM space is used for the console buffer storage. The size and location of
  * the area are defined by the linker script with _(e)preram_cbmem_console.
- */
-
-#else
-
-/*
+ *
  * When running from RAM, some console output is generated before CBMEM is
  * reinitialized. This static buffer is used to store that output temporarily,
  * to be concatenated with the CBMEM console buffer contents accumulated
@@ -69,7 +64,6 @@ static struct cbmem_console *cbmem_console_p CAR_GLOBAL;
 
 #define STATIC_CONSOLE_SIZE 1024
 static u8 static_console[STATIC_CONSOLE_SIZE];
-#endif
 
 static struct cbmem_console *current_console(void)
 {
@@ -107,14 +101,13 @@ static void init_console_ptr(void *storage, u32 total_space)
 
 void cbmemc_init(void)
 {
-#ifdef __PRE_RAM__
-	/* Pre-RAM environments use special buffer placed by linker script. */
-	init_console_ptr(_preram_cbmem_console,
-			 REGION_SIZE(preram_cbmem_console));
-#else
-	/* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */
-	init_console_ptr(static_console, sizeof(static_console));
-#endif
+	if (ENV_ROMSTAGE_OR_BEFORE) {
+		/* Pre-RAM environments use special buffer placed by linker script. */
+		init_console_ptr(_preram_cbmem_console, REGION_SIZE(preram_cbmem_console));
+	} else {
+		/* Post-RAM uses static (BSS) buffer before CBMEM is reinitialized. */
+		init_console_ptr(static_console, sizeof(static_console));
+	}
 }
 
 void cbmemc_tx_byte(unsigned char data)
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index e5c3e417d3..f04e0862fe 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -172,14 +172,13 @@ int cbmem_initialize_id_size(u32 id, u64 size)
 	if (imd_recover(imd))
 		return 1;
 
-#if defined(__PRE_RAM__)
 	/*
 	 * Lock the imd in romstage on a recovery. The assumption is that
 	 * if the imd area was recovered in romstage then S3 resume path
 	 * is being taken.
 	 */
-	imd_lockdown(imd);
-#endif
+	if (ENV_ROMSTAGE)
+		imd_lockdown(imd);
 
 	/* Add the specified range first */
 	if (size)
diff --git a/src/lib/program.ld b/src/lib/program.ld
index ad364a4b0c..a9d4e48293 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -108,7 +108,7 @@
 	*(.sdata);
 	*(.sdata.*);
 
-#ifdef __PRE_RAM__
+#if ENV_ROMSTAGE_OR_BEFORE
 	PROVIDE(_preram_cbmem_console = .);
 	PROVIDE(_epreram_cbmem_console = _preram_cbmem_console);
 #elif ENV_RAMSTAGE
diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c
index 50cf7b6d08..5f4fa9fa11 100644
--- a/src/lib/reg_script.c
+++ b/src/lib/reg_script.c
@@ -36,7 +36,8 @@
 #endif
 
 #define POLL_DELAY 100 /* 100us */
-#if defined(__PRE_RAM__)
+
+#ifdef __SIMPLE_DEVICE__
 #define EMPTY_DEV 0
 #else
 #define EMPTY_DEV NULL
@@ -68,7 +69,7 @@ reg_script_get_step(struct reg_script_context *ctx)
 
 static struct resource *reg_script_get_resource(struct reg_script_context *ctx)
 {
-#if defined(__PRE_RAM__)
+#ifdef __SIMPLE_DEVICE__
 	return NULL;
 #else
 	struct resource *res;